From 159ff9c811369cb62c787569ba3658265116295d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 5 Jul 2001 03:21:52 +0000 Subject: [PATCH] Make compile. Wed Jul 4 23:17:04 2001 Owen Taylor * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed): Make compile. * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem with calling gtk_widget_set_style_internal() with the old style, not the new style. (#56989) --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkdnd.c | 5 +++-- gtk/gtkwidget.c | 4 ++-- 9 files changed, 68 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4928ac7c3..5021df944a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Jul 4 23:17:04 2001 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed): + Make compile. + + * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem + with calling gtk_widget_set_style_internal() with + the old style, not the new style. (#56989) + Wed Jul 4 22:35:40 2001 Owen Taylor * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e4928ac7c3..5021df944a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Wed Jul 4 23:17:04 2001 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed): + Make compile. + + * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem + with calling gtk_widget_set_style_internal() with + the old style, not the new style. (#56989) + Wed Jul 4 22:35:40 2001 Owen Taylor * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e4928ac7c3..5021df944a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Wed Jul 4 23:17:04 2001 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed): + Make compile. + + * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem + with calling gtk_widget_set_style_internal() with + the old style, not the new style. (#56989) + Wed Jul 4 22:35:40 2001 Owen Taylor * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e4928ac7c3..5021df944a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Wed Jul 4 23:17:04 2001 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed): + Make compile. + + * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem + with calling gtk_widget_set_style_internal() with + the old style, not the new style. (#56989) + Wed Jul 4 22:35:40 2001 Owen Taylor * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e4928ac7c3..5021df944a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Wed Jul 4 23:17:04 2001 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed): + Make compile. + + * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem + with calling gtk_widget_set_style_internal() with + the old style, not the new style. (#56989) + Wed Jul 4 22:35:40 2001 Owen Taylor * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e4928ac7c3..5021df944a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Wed Jul 4 23:17:04 2001 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed): + Make compile. + + * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem + with calling gtk_widget_set_style_internal() with + the old style, not the new style. (#56989) + Wed Jul 4 22:35:40 2001 Owen Taylor * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e4928ac7c3..5021df944a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Wed Jul 4 23:17:04 2001 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_hierarchy_changed): + Make compile. + + * gtk/gtkwidget.c (gtk_widget_reset_rc_style): Fix problem + with calling gtk_widget_set_style_internal() with + the old style, not the new style. (#56989) + Wed Jul 4 22:35:40 2001 Owen Taylor * gtk/gtklabel.c gtk/gtkmenubar.c gtk/gtktreeviewcolumn.c diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index f97ad54d3e..cd3f14cb10 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -208,7 +208,7 @@ static void gtk_drag_proxy_begin (GtkWidget *widget, guint32 time); static void gtk_drag_dest_realized (GtkWidget *widget); static void gtk_drag_dest_hierarchy_changed (GtkWidget *widget, - GtkWidget *old_toplevel); + GtkWidget *previous_toplevel); static void gtk_drag_dest_site_destroy (gpointer data); static void gtk_drag_dest_leave (GtkWidget *widget, GdkDragContext *context, @@ -1438,7 +1438,8 @@ gtk_drag_dest_realized (GtkWidget *widget) } static void -gtk_drag_dest_hierarchy_changed (GtkWidget *widget) +gtk_drag_dest_hierarchy_changed (GtkWidget *widget, + GtkWidget *previous_toplevel) { GtkWidget *toplevel = gtk_widget_get_toplevel (widget); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 29bf94167c..34bfb84883 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3253,7 +3253,7 @@ gtk_widget_set_name (GtkWidget *widget, g_object_notify (G_OBJECT (widget), "name"); } -s + /** * gtk_widget_get_name: * @widget: a #GtkWidget @@ -3574,7 +3574,7 @@ gtk_widget_reset_rc_style (GtkWidget *widget) new_style = gtk_widget_get_default_style (); if (initial_emission || new_style != widget->style) - gtk_widget_set_style_internal (widget, widget->style, TRUE); + gtk_widget_set_style_internal (widget, new_style, TRUE); } /** -- 2.30.2